From: Benjamin Otte <otte@redhat.com>
Date: Tue, 7 Jun 2016 14:08:52 +0000 (+0200)
Subject: widget: Add classes to widget path even if no style context exists yet
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~1620
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=775e277ab9753609b45063eb8c0171b3103a252d;p=gtk%2B3.0.git

widget: Add classes to widget path even if no style context exists yet

This removes leftover code from when classes where added to the style
context.
Now that they get added directly to css nodes, the classes can exist
without a style context.

https://bugzilla.gnome.org/show_bug.cgi?id=767312
---

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index b5d552d3e8..006be5ee85 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -16361,6 +16361,8 @@ gint
 gtk_widget_path_append_for_widget (GtkWidgetPath *path,
                                    GtkWidget     *widget)
 {
+  const GQuark *classes;
+  guint n_classes, i;
   gint pos;
 
   g_return_val_if_fail (path != NULL, 0);
@@ -16374,19 +16376,10 @@ gtk_widget_path_append_for_widget (GtkWidgetPath *path,
 
   gtk_widget_path_iter_set_state (path, pos, widget->priv->state_flags);
 
-  if (widget->priv->context)
-    {
-      const GQuark *classes;
-      guint n_classes, i;
+  classes = gtk_css_node_list_classes (widget->priv->cssnode, &n_classes);
 
-      /* Also add any persistent classes in
-       * the style context the widget path
-       */
-      classes = gtk_css_node_list_classes (widget->priv->cssnode, &n_classes);
-
-      for (i = n_classes; i-- > 0;)
-        gtk_widget_path_iter_add_qclass (path, pos, classes[i]);
-    }
+  for (i = n_classes; i-- > 0;)
+    gtk_widget_path_iter_add_qclass (path, pos, classes[i]);
 
   return pos;
 }